]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
ci: Improve script output
authorFlorian Müllner <fmuellner@gnome.org>
Fri, 26 Apr 2019 18:34:45 +0000 (20:34 +0200)
committerFlorian Müllner <fmuellner@gnome.org>
Fri, 26 Apr 2019 19:32:51 +0000 (21:32 +0200)
git-fetch's -q flag doesn't suppress warnings, so it's not a full
replacement of the redirection that was removed in commit 8cefd919.
Shut up the cryptic warning and replace it with a clearer log message
instead.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/511

.gitlab-ci/checkout-mutter.sh

index 9eb72ebfc32e1ba2e57aaa98aab14bff7fc9a77a..0193467483f9f91ac6c2efba14979bc57408c5d2 100755 (executable)
@@ -17,10 +17,11 @@ if [ "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" ]; then
   merge_request_branch=$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
 
   echo Looking for $merge_request_branch on remote ...
-  if git fetch -q $merge_request_remote $merge_request_branch; then
+  if git fetch -q $merge_request_remote $merge_request_branch 2>/dev/null; then
     mutter_target=FETCH_HEAD
   else
     mutter_target=origin/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME
+    echo Using $mutter_target instead
   fi
 fi